Removed unnecesary files and moved to application framework